Skip to content

add rabbitmq jasypt property encryption facility - #13676

Draft
DaanHoogland wants to merge 3 commits into
apache:4.22from
shapeblue:ghi13352-rabbitmqEncryption
Draft

add rabbitmq jasypt property encryption facility#13676
DaanHoogland wants to merge 3 commits into
apache:4.22from
shapeblue:ghi13352-rabbitmqEncryption

Conversation

@DaanHoogland

@DaanHoogland DaanHoogland commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

Description

This PR...

Fixes: #13352

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • Build/CI
  • Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@codecov

codecov Bot commented Jul 23, 2026 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 92.30769% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 18.32%. Comparing base (d02adcd) to head (e557f3b).

Files with missing lines Patch % Lines
...rypt/EncryptablePropertyPlaceholderConfigurer.java 92.30% 0 Missing and 1 partial ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               4.22   #13676      +/-   ##
============================================
- Coverage     18.32%   18.32%   -0.01%     
  Complexity    16644    16644              
============================================
  Files          5939     5940       +1     
  Lines        537768   537781      +13     
  Branches      65929    65932       +3     
============================================
- Hits          98551    98533      -18     
- Misses       428008   428040      +32     
+ Partials      11209    11208       -1
Flag Coverage Δ
uitests 4.08% <ø> (ø)
unittests 19.41% <92.30%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@DaanHoogland DaanHoogland mentioned this pull request Jul 23, 2026
Open
@DaanHoogland
DaanHoogland force-pushed the ghi13352-rabbitmqEncryption branch from 9adf608 to 55fb559 Compare July 24, 2026 10:37
@DaanHoogland

DaanHoogland commented Jul 24, 2026

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@DaanHoogland DaanHoogland added this to the 4.22.2 milestone Jul 24, 2026
@DaanHoogland
DaanHoogland requested a review from Copilot July 24, 2026 10:38
Copilot AI reviewed Jul 24, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds a Spring PropertyPlaceholderConfigurer implementation in utils to decrypt ENC(...)-wrapped property values using a provided Jasypt StringEncryptor, intended to replace the missing/incompatible jasypt-spring3 placeholder configurer referenced in RabbitMQ encryption docs/config.

Changes:

  • Introduces EncryptablePropertyPlaceholderConfigurer to decrypt ENC(...) property values during Spring placeholder resolution.
  • Adds unit tests covering encrypted, whitespace-wrapped encrypted, plain, and null property values.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
utils/src/main/java/com/cloud/utils/crypt/EncryptablePropertyPlaceholderConfigurer.java New Spring placeholder configurer that decrypts ENC(...) values via Jasypt StringEncryptor.
utils/src/test/java/com/cloud/utils/crypt/EncryptablePropertyPlaceholderConfigurerTest.java Unit tests validating decrypt/pass-through/null handling behavior.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread utils/src/main/java/com/cloud/utils/crypt/EncryptablePropertyPlaceholderConfigurer.java Resolved
@DaanHoogland DaanHoogland mentioned this pull request Jul 24, 2026
Open
@DaanHoogland DaanHoogland linked an issue Aug 21, 2026 that may be closed by this pull request
The documented RabbitMQ credential encryption feature using Jasypt is non-functional on CloudStack 4.22.x #13352
Open
@DaanHoogland DaanHoogland moved this from Backlog to Ready in CloudStack Testing Aug 31, 2026
@nvazquez nvazquez modified the milestones: 4.22.2, 4.22.3 Nov 9, 2026
@DaanHoogland
DaanHoogland force-pushed the ghi13352-rabbitmqEncryption branch from 1e9623a to e557f3b Compare November 9, 2026 13:19

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@ingox ingox Awaiting requested review from ingox
@vladimirpetrov vladimirpetrov Awaiting requested review from vladimirpetrov

Assignees

No one assigned

Labels

status:needs-review status:needs-testing

Projects

CloudStack Testing
Status: Ready

Milestone

4.22.3

Development

Successfully merging this pull request may close these issues.

The documented RabbitMQ credential encryption feature using Jasypt is non-functional on CloudStack 4.22.x

3 participants

@DaanHoogland @nvazquez